Make java_sdk_library dependencies explicit modules should specify the submodule of java_sdk_library that the module actually depends on Test: CI Bug: 358613520 Change-Id: I6186aedd57f7f1c5466d49b627fc8df65af362c2
diff --git a/service/Android.bp b/service/Android.bp index 3ba2551..fcb89ca 100644 --- a/service/Android.bp +++ b/service/Android.bp
@@ -56,7 +56,7 @@ ], sdk_version: "system_server_current", libs: [ - "framework-configinfrastructure", + "framework-configinfrastructure.stubs.module_lib", "framework-scheduling.impl", "framework-tethering.stubs.module_lib", "unsupportedappusage",
diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp index 78ea03b..0e01922 100644 --- a/tests/unittests/Android.bp +++ b/tests/unittests/Android.bp
@@ -28,9 +28,9 @@ "truth", ], libs: [ - "android.test.mock", - "android.test.base", - "android.test.runner", + "android.test.mock.stubs.system", + "android.test.base.stubs.system", + "android.test.runner.stubs.system", ], jni_libs: [ // Required for ExtendedMockito
